Update docs for immodules

diff --git a/docs/reference/gtk/building.sgml b/docs/reference/gtk/building.sgml
index f5a65fe12de220cc3965fd55a26d8b859933602d..04f0d20cef2d0fdf374896ad85e6a24b7bc17355 100644 (file)
--- a/docs/reference/gtk/building.sgml
+++ b/docs/reference/gtk/building.sgml
@@ -293,17 +293,6 @@ How to compile GTK+ itself
         <cmdsynopsis>
           <command>meson</command>
           <sbr/>
-          <group>
-            <arg choice="plain">-Ddisable-modules=true</arg>
-            <arg choice="plain">-Ddisable-modules=false</arg>
-          </group>
-          <sbr/>
-          <group>
-            <arg choice="plain">-Dwith-included-immodules=MODULE1,MODULE2,...</arg>
-            <arg choice="plain">-Dwith-included-immodules=all</arg>
-            <arg choice="plain">-Dwith-included-immodules=none</arg>
-          </group>
-          <sbr/>
           <group>
             <arg choice="plain">-Ddocumentation=true</arg>
             <arg choice="plain">-Ddocumentation=false</arg>
@@ -391,32 +380,6 @@ How to compile GTK+ itself
         </cmdsynopsis>
       </para>
 
-      <formalpara>
-        <title><systemitem>disable-modules</systemitem></title>
-
-        <para>
-          Normally GTK+ will try to build the input method modules
-          as little shared libraries that are loaded on demand.
-          The <systemitem>disable-modules</systemitem> option
-          indicates that they should all be built statically
-          into the GTK+ library instead. This is useful for
-          people who need to produce statically-linked binaries.
-          If <systemitem>disable-modules</systemitem> is not specified,
-          then the <command>configure</command> script will try to
-          auto-detect whether shared modules work on your system.
-        </para>
-      </formalpara>
-
-      <formalpara>
-        <title><systemitem>with-included-immodules</systemitem></title>
-
-        <para>
-         This option allows you to specify which input method modules you
-         want to include directly into the GTK+ shared library, as opposed
-         to building them as loadable modules.
-        </para>
-      </formalpara>
-
       <formalpara>
         <title><systemitem>enable-xinerama</systemitem></title>
 

diff --git a/docs/reference/gtk/gtk4-docs.xml b/docs/reference/gtk/gtk4-docs.xml
index 77056be063a7693a7d7b05114df27312ef72f63d..a6d89f12b04cf0c08fb2e8ce82c7a276131a64c9 100644 (file)
--- a/docs/reference/gtk/gtk4-docs.xml
+++ b/docs/reference/gtk/gtk4-docs.xml
@@ -351,7 +351,6 @@
     <xi:include href="gtk4-demo-application.xml" />
     <xi:include href="gtk4-widget-factory.xml" />
     <xi:include href="gtk4-icon-browser.xml" />
-    <xi:include href="gtk4-query-immodules.xml" />
     <xi:include href="gtk4-update-icon-cache.xml" />
     <xi:include href="gtk4-encode-symbolic-svg.xml" />
     <xi:include href="gtk4-builder-tool.xml" />

diff --git a/docs/reference/gtk/gtk4-query-immodules.xml b/docs/reference/gtk/gtk4-query-immodules.xml
deleted file mode 100644 (file)
index 59512f1..0000000
--- a/docs/reference/gtk/gtk4-query-immodules.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<refentry id="gtk4-query-immodules">
-
-<refentryinfo>
-  <title>gtk4-query-immodules</title>
-  <productname>GTK+</productname>
-  <authorgroup>
-    <author>
-      <contrib>Developer</contrib>
-      <firstname>Matthias</firstname>
-      <surname>Clasen</surname>
-    </author>
-  </authorgroup>
-</refentryinfo>
-
-<refmeta>
-  <refentrytitle>gtk4-query-immodules</refentrytitle>
-  <manvolnum>1</manvolnum>
-  <refmiscinfo class="manual">User Commands</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-  <refname>gtk4-query-immodules</refname>
-  <refpurpose>Input method module registration utility</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-<cmdsynopsis>
-<command>gtk4-query-immodules</command>
-<arg choice="opt">--update-cache</arg>
-<arg choice="opt" rep="repeat">MODULE</arg>
-</cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1><title>Description</title>
-<para>
-<command>gtk4-query-immodules</command> collects information about loadable
-input method modules for GTK+ and writes it to the default cache file
-location, or to <filename>stdout</filename>.
-</para>
-<para>
-If called without arguments, it looks for modules in the GTK+ input method
-module path.
-</para>
-<para>
-If called with arguments, it looks for the specified modules. The arguments
-may be absolute or relative paths.
-</para>
-
-<para>
-Normally, the output of <command>gtk4-query-immodules</command> is written
-to <filename><replaceable>libdir</replaceable>/gtk-4.0/4.0.0/immodules.cache</filename>,
-where GTK+ looks for it by default. If it is written to some other location,
-the <envar>GTK_IM_MODULE_FILE</envar> environment variable can be set to point
-GTK+ at the file.
-</para>
-</refsect1>
-
-<refsect1><title>Options</title>
-<variablelist>
-  <varlistentry>
-    <term>--update-cache</term>
-    <listitem><para>Write the output to the default cache location instead of
-                    <filename>stdout</filename></para></listitem>
-  </varlistentry>
-</variablelist>
-</refsect1>
-
-<refsect1><title>Files</title>
-<variablelist>
-  <varlistentry>
-    <term><filename><replaceable>libdir</replaceable>/gtk-4.0/4.0.0/immodules.cache</filename></term>
-    <listitem><para>The default im cache file used by GTK+ applications</para></listitem>
-  </varlistentry>
-</variablelist>
-
-</refsect1>
-
-<refsect1><title>Environment</title>
-<variablelist>
-  <varlistentry>
-    <term><link linkend="gtk-path"><envar>GTK_PATH</envar></link></term>
-    <listitem><para>Prepends directories to the input method module path</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><link linkend="gtk-im-module-file"><envar>GTK_IM_MODULE_FILE</envar></link></term>
-    <listitem><para>Specifies an alternative im module cache for GTK+
-    applications</para></listitem>
-  </varlistentry>
-</variablelist>
-</refsect1>
-
-</refentry>

diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index 45ee4de405d03ed1c9ad862876ab78b61363f28e..e5d867e536a4524bc4071b23dd8a4f4896e1b806 100644 (file)
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -1533,7 +1533,6 @@ GtkImageGIconData
 <TITLE>GtkIMContext</TITLE>
 GtkIMContext
 GtkIMContextClass
-GtkIMContextInfo
 gtk_im_context_get_preedit_string
 gtk_im_context_filter_keypress
 gtk_im_context_focus_in

diff --git a/docs/reference/gtk/meson.build b/docs/reference/gtk/meson.build
index dbcd77ea3e614185e2eaac1150c91a4ef13caab8..0687fda61fc80961aab32793daedfb9991746f09 100644 (file)
--- a/docs/reference/gtk/meson.build
+++ b/docs/reference/gtk/meson.build
@@ -158,7 +158,6 @@ content_files = [
   'gtk4-encode-symbolic-svg.xml',
   'gtk4-icon-browser.xml',
   'gtk4-launch.xml',
-  'gtk4-query-immodules.xml',
   'gtk4-query-settings.xml',
   'gtk4-update-icon-cache.xml',
   'gtk4-widget-factory.xml',
@@ -261,7 +260,6 @@ if get_option('man-pages') and xsltproc.found()
     [ 'gtk4-encode-symbolic-svg', '1', ],
     [ 'gtk4-icon-browser', '1', ],
     [ 'gtk4-launch', '1', ],
-    [ 'gtk4-query-immodules', '1', ],
     [ 'gtk4-query-settings', '1', ],
     [ 'gtk4-update-icon-cache', '1', ],
     [ 'gtk4-widget-factory', '1', ],

diff --git a/docs/reference/gtk/running.sgml b/docs/reference/gtk/running.sgml
index e26370f12d8f579c9dfae9a7172f3c541ef3bc05..e10028226fa32020b15d2d1972679d691befbc31 100644 (file)
--- a/docs/reference/gtk/running.sgml
+++ b/docs/reference/gtk/running.sgml
@@ -183,27 +183,6 @@ additional environment variables.
   </para>
 </formalpara>
 
-<formalpara id="gtk-im-module-file">
-  <title><envar>GTK_IM_MODULE_FILE</envar></title>
-
-  <para>
-    Specifies the file listing the IM modules to load. This environment
-    variable the default value
-    <filename><replaceable>libdir</replaceable>/gtk-4.0/4.0.0/immodules.cache</filename>
-    (<replaceable>libdir</replaceable> has the same meaning here as explained for <envar>GTK_PATH</envar>).
-  </para>
-  <para>
-    The <filename>immodules.cache</filename> file is generated by the
-    <command>gtk-query-immodules-3.0</command> utility.
-  </para>
-  <warning>
-    Note that this environment variable is read by GTK+ 2.x too, which
-    makes it unsuitable for setting it system-wide (or session-wide),
-    since doing so will cause either GTK+ 2.x applications or GTK+ 3
-    applications to see the wrong list of IM modules.
-  </warning>
-</formalpara>
-
 <formalpara>
   <title><envar>GTK_EXE_PREFIX</envar></title>